The patch allows the shadow mode code to support >4GB physical memory. I

tested VMX domains on an x86_64 machine with >4GB; it fails without this
change. This should be applicable to PAE as well.

This patch is good for up to 32GB RAM.

Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>

diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h
index 4b7eb641ff38680089d177089e7b6da760eb0ac7..ec9654741b19348a050badb7e6066a418ad54873 100644 (file)
--- a/xen/include/asm-x86/mm.h
+++ b/xen/include/asm-x86/mm.h
@@ -98,9 +98,10 @@ struct pfn_info
  /* 16-bit count of uses of this frame as its current type. */
 #define PGT_count_mask      ((1U<<16)-1)
 
-#define PGT_mfn_mask        ((1U<<20)-1) /* mfn mask for shadow types */
+ /* 23-bit mfn mask for shadow types: good for up to 32GB RAM. */
+#define PGT_mfn_mask        ((1U<<23)-1)
 
-#define PGT_score_shift     20
+#define PGT_score_shift     23
 #define PGT_score_mask      (((1U<<4)-1)<<PGT_score_shift)
 
  /* Cleared when the owning guest 'frees' this page. */